From: Romain Francoise <romain@orebokech.com>
Date: Mon, 13 Dec 2010 22:20:32 +0000 (+0100)
Subject: * net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5397
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9eb13fbc92e812597d47533a601f840c8da9d5be;p=emacs.git

* net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86bdbd680c2..003c672528b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-13  Romain Francoise  <romain@orebokech.com>
+
+	* net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
+
 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* subr.el (posn-col-row): Evaluate header-line-format in the
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 85c546ffd3f..e49af2948e6 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -77,7 +77,7 @@ PRIORITY-STRING is as per the GnuTLS docs, default is \"NORMAL\".
 TRUSTFILES is a list of CA bundles.
 KEYFILES is a list of client keys."
   (let* ((type (or type 'gnutls-x509pki))
-         (trusfiles (or trustfiles
+         (trustfiles (or trustfiles
                         '("/etc/ssl/certs/ca-certificates.crt")))
          (priority-string (or priority-string
                               (cond